Merge pull request #28 from ydb-platform/develop

Update to new version of Java SDK
ydb-platform · Mar 28, 2024 · 952de6e · 952de6e
2 parents 35ce0d2 + 59b6bc6
commit 952de6e
Show file tree

Hide file tree

Showing 27 changed files with 992 additions and 177 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
       - master
       - develop
   pull_request:
-      type: [opened, reopened, edited]
+      type: [opened, reopened, edited, synchronize]
 
 jobs:
   build:
@@ -44,7 +44,7 @@ jobs:
 
       - name: Checkout YDB Java SDK
         if: ${{ env.NEED_SDK }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ydb-platform/ydb-java-sdk
           ref: develop
@@ -61,7 +61,7 @@ jobs:
 
       - name: Checkout YDB YC Auth Provider
         if: ${{ env.NEED_SDK }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ydb-platform/ydb-java-yc
           ref: develop

diff --git a/auth/access_token_credentials/src/main/java/tech/ydb/example/Main.java b/auth/access_token_credentials/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,12 @@
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
 
 import tech.ydb.auth.AuthProvider;
 import tech.ydb.auth.TokenAuthProvider;
-import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -25,23 +24,20 @@ public static void main(String[] args) {
         // Access token credentials
         AuthProvider authProvider = new TokenAuthProvider(accessToken);
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/auth/anonymous_credentials/src/main/java/tech/ydb/example/Main.java b/auth/anonymous_credentials/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,12 @@
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
 
 import tech.ydb.auth.AuthProvider;
 import tech.ydb.auth.NopAuthProvider;
-import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -22,24 +21,20 @@ public static void main(String[] args) {
         // Anonymous credentials
         AuthProvider authProvider = NopAuthProvider.INSTANCE;
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
-
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/auth/environ/src/main/java/tech/ydb/example/Main.java b/auth/environ/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,12 @@
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
 
 import tech.ydb.auth.AuthProvider;
 import tech.ydb.auth.iam.CloudAuthHelper;
-import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -22,24 +21,20 @@ public static void main(String[] args) {
         // Construct authProvider from environment variables
         AuthProvider authProvider = CloudAuthHelper.getAuthProviderFromEnviron();
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
-
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/auth/metadata_credentials/src/main/java/tech/ydb/example/Main.java b/auth/metadata_credentials/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,12 @@
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
 
 import tech.ydb.auth.AuthProvider;
 import tech.ydb.auth.iam.CloudAuthHelper;
-import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -23,24 +22,20 @@ public static void main(String[] args) {
         // Use metadata credentials
         AuthProvider authProvider = CloudAuthHelper.getMetadataAuthProvider();
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
-
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/auth/service_account_credentials/src/main/java/tech/ydb/example/Main.java b/auth/service_account_credentials/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,12 @@
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
 
 import tech.ydb.auth.AuthProvider;
 import tech.ydb.auth.iam.CloudAuthHelper;
-import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -23,24 +22,20 @@ public static void main(String[] args) {
 
         AuthProvider authProvider = CloudAuthHelper.getServiceAccountFileAuthProvider(saKeyFile);
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
-
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/auth/static_credentials/src/main/java/tech/ydb/example/Main.java b/auth/static_credentials/src/main/java/tech/ydb/example/Main.java
@@ -1,13 +1,11 @@
 
 package tech.ydb.example;
 
-import java.util.concurrent.CompletableFuture;
-
-import tech.ydb.core.Result;
 import tech.ydb.core.auth.StaticCredentials;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.table.SessionRetryContext;
 import tech.ydb.table.TableClient;
+import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.transaction.TxControl;
 
@@ -29,23 +27,20 @@ public static void main(String[] args) {
         // Use credentials auth provider with username and password
         StaticCredentials authProvider = new StaticCredentials(username, password);
 
-        try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
-                .withAuthProvider(authProvider) // Or this method could not be called at all
+        try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
+                .withAuthProvider(authProvider)
                 .build()) {
-            try ( TableClient tableClient = TableClient
-                    .newClient(transport)
-                    .build()) {
+            try (TableClient tableClient = TableClient.newClient(transport).build()) {
                 SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
 
-                retryCtx.supplyResult(session -> {
-                    ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
-                            .join().getValue().getResultSet(0);
+                DataQueryResult dataQueryResult = retryCtx.supplyResult(
+                        session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
+                ).join().getValue();
 
-                    rsReader.next();
+                ResultSetReader rsReader = dataQueryResult.getResultSet(0);
+                while (rsReader.next()) {
                     System.out.println(rsReader.getColumn(0).getInt32());
-
-                    return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
-                }).join();
+                }
             }
         }
     }

diff --git a/basic_example/pom.xml b/basic_example/pom.xml
@@ -12,15 +12,15 @@
     <name>YDB Basic Example</name>
     <description>Simple example of usage Java SDK for YDB</description>
 
+    <properties>
+        <junit5.version>5.10.1</junit5.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>tech.ydb</groupId>
             <artifactId>ydb-sdk-table</artifactId>
         </dependency>
-        <dependency>
-            <groupId>tech.ydb</groupId>
-            <artifactId>ydb-sdk-topic</artifactId>
-        </dependency>
         <dependency>
             <groupId>tech.ydb.auth</groupId>
             <artifactId>yc-auth-provider</artifactId>
@@ -30,6 +30,19 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>tech.ydb.test</groupId>
+            <artifactId>ydb-junit5-support</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -52,7 +65,18 @@
                             <mainClass>tech.ydb.example.App</mainClass>
                         </manifest>
                     </archive>
-                </configuration>   
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
+                        <YDB_ANONYMOUS_CREDENTIALS>1</YDB_ANONYMOUS_CREDENTIALS>
+                    </environmentVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>